gtk/gtkmain.c don't #include <libintl.h>, it's pulled in via "gtkintl.h"

2008-06-12  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkmain.c
	* gtk/gtktrayicon-x11.c: don't #include <libintl.h>, it's pulled
	in via "gtkintl.h" from <glib/gi18n-lib.h>.

svn path=/trunk/; revision=20362

diff --git a/ChangeLog b/ChangeLog
index 1fbbe5c7845919e572b20e0d2102b2c75d97b8ae..348686fb3544bc96cedbea264d130d8fa3d87ad9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkmain.c
+       * gtk/gtktrayicon-x11.c: don't #include <libintl.h>, it's pulled
+       in via "gtkintl.h" from <glib/gi18n-lib.h>.
+
 2008-06-12  Matthias Clasen  <mclasen@redhat.com>
 
        RH bug 248245 and 449379: cups client printing from gnome

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 234deb684a76e23dfca9a35eca60de48179fdf64..f844af22c4854a3e43989695df08e1f9bc902e24 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -31,10 +31,6 @@
 
 #include <locale.h>
 
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-#include <libintl.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/gtk/gtktrayicon-x11.c b/gtk/gtktrayicon-x11.c
index b8bec7d7dfb8f426ab0cdcdba89b09d5fb9733a9..10a97c82564ec184878748a18cd915707d4505aa 100755 (executable)
--- a/gtk/gtktrayicon-x11.c
+++ b/gtk/gtktrayicon-x11.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 #include <string.h>
-#include <libintl.h>
 
 #include "gtkintl.h"
 #include "gtkprivate.h"